From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 29 Mar 2011 08:04:47 +0000 (+0200)
Subject: notificationDaemon: only ignore 'chat' and 'presence' notifications from Empathy... 
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8399
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9396d736f29acb066e2cc54b2bc098aead196c6f;p=gnome-shell.git

notificationDaemon: only ignore 'chat' and 'presence' notifications from Empathy (#645932)
---

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index d2a50d0e3..d82dd3571 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -189,9 +189,11 @@ NotificationDaemon.prototype = {
                      actions, hints, timeout) {
         let id;
 
-        // Filter out notifications from Empathy, since we
+        // Filter out chat and presence notifications from Empathy, since we
         // handle that information from telepathyClient.js
-        if (appName == 'Empathy') {
+        if (appName == 'Empathy' && (hints['category'] == 'im.received' ||
+              hints['category'] == 'presence.online' ||
+              hints['category'] == 'presence.offline')) {
             // Ignore replacesId since we already sent back a
             // NotificationClosed for that id.
             id = nextNotificationId++;